diff -urN xntp3-5.93c/ChangeLog xntp3-5.93d/ChangeLog
--- xntp3-5.93c/ChangeLog	Mon Aug 10 18:57:56 1998
+++ xntp3-5.93d/ChangeLog	Tue Jun 23 22:10:25 1998
@@ -1,3 +1,15 @@
+Tue Jun 23 22:09:07 1998  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+	* configure.in: 5.93d
+
+Tue Jun 23 22:03:38 1998  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+	* configure.in: No kernel pll in solaris 2.7...
+	From: Per Hedeland <per@erix.ericsson.se>
+
+	* util/tickadj.c (main): Typo.
+	From: Marion Hakanson <hakanson@cse.ogi.edu>
+
 Wed May  6 15:38:31 1998  Harlan Stenn  <stenn@whimsy.udel.edu>
 
 	* xntpd/refclock_jupiter.c: Typo.
diff -urN xntp3-5.93c/Makefile.in xntp3-5.93d/Makefile.in
--- xntp3-5.93c/Makefile.in	Sat Apr 25 18:19:24 1998
+++ xntp3-5.93d/Makefile.in	Tue Jun 23 22:19:10 1998
@@ -228,7 +228,7 @@
 	done; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/adjtimed/Makefile.in xntp3-5.93d/adjtimed/Makefile.in
--- xntp3-5.93c/adjtimed/Makefile.in	Sat Apr 25 18:22:10 1998
+++ xntp3-5.93d/adjtimed/Makefile.in	Tue Jun 23 22:20:04 1998
@@ -202,7 +202,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/authstuff/Makefile.in xntp3-5.93d/authstuff/Makefile.in
--- xntp3-5.93c/authstuff/Makefile.in	Sat Apr 25 18:20:49 1998
+++ xntp3-5.93d/authstuff/Makefile.in	Tue Jun 23 22:19:43 1998
@@ -266,7 +266,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/clockstuff/Makefile.in xntp3-5.93d/clockstuff/Makefile.in
--- xntp3-5.93c/clockstuff/Makefile.in	Sat Apr 25 18:22:18 1998
+++ xntp3-5.93d/clockstuff/Makefile.in	Tue Jun 23 22:20:06 1998
@@ -196,7 +196,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/configure xntp3-5.93d/configure
--- xntp3-5.93c/configure	Mon Aug 10 18:57:46 1998
+++ xntp3-5.93d/configure	Tue Jun 23 22:11:22 1998
@@ -787,7 +787,7 @@
 
 PACKAGE=xntp3
 
-VERSION=5.93a
+VERSION=5.93d
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -3796,7 +3796,7 @@
 
 case "$target" in
  *-*-linux*)
-    for ac_func in __adjtimex __ntp_gettime
+    for ac_func in __adjtimex
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:3803: checking for $ac_func" >&5
@@ -5534,8 +5534,8 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_var_ntp_syscalls=no
- case "$ac_cv_func___adjtimex$ac_cv_func___ntp_gettime" in
-  yesyes)
+ case "$ac_cv_func___adjtimex" in
+  yes)
     ac_cv_var_ntp_syscalls=libc
     ;;
   *) case "$ac_cv_func_ntp_adjtime$ac_cv_func_ntp_gettime" in
@@ -5620,7 +5620,7 @@
     ac_cv_var_kernel_pll=no
     ;;
  *) case "$target" in
-     *-*-solaris2.6)
+     *-*-solaris2.[67])
 	# Broken...
 	ac_cv_var_kernel_pll=no
 	;;
@@ -5628,7 +5628,8 @@
 	;;
     esac
     ;;
-esac
+ esac
+
 fi
 
 echo "$ac_t""$ac_cv_var_kernel_pll" 1>&6
@@ -5642,7 +5643,7 @@
 esac
 
 echo $ac_n "checking if SIOCGIFCONF returns buffer size in the buffer""... $ac_c" 1>&6
-echo "configure:5646: checking if SIOCGIFCONF returns buffer size in the buffer" >&5
+echo "configure:5647: checking if SIOCGIFCONF returns buffer size in the buffer" >&5
 if eval "test \"`echo '$''{'ac_cv_var_size_returned_in_buffer'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5670,7 +5671,7 @@
 esac
 
 echo $ac_n "checking if we want GDT surveying code""... $ac_c" 1>&6
-echo "configure:5674: checking if we want GDT surveying code" >&5
+echo "configure:5675: checking if we want GDT surveying code" >&5
 if eval "test \"`echo '$''{'ac_cv_var_gdt_surveying'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5694,7 +5695,7 @@
 esac
 
 echo $ac_n "checking if we want to use MD5 authentication""... $ac_c" 1>&6
-echo "configure:5698: checking if we want to use MD5 authentication" >&5
+echo "configure:5699: checking if we want to use MD5 authentication" >&5
 if eval "test \"`echo '$''{'ac_cv_var_use_md5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5718,7 +5719,7 @@
 esac
 
 echo $ac_n "checking if we want to use DES authentication""... $ac_c" 1>&6
-echo "configure:5722: checking if we want to use DES authentication" >&5
+echo "configure:5723: checking if we want to use DES authentication" >&5
 if eval "test \"`echo '$''{'ac_cv_var_use_des'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5757,7 +5758,7 @@
 
 # HPUX only, and by explicit request
 echo $ac_n "checking Datum/Bancomm bc635/VME interface""... $ac_c" 1>&6
-echo "configure:5761: checking Datum/Bancomm bc635/VME interface" >&5
+echo "configure:5762: checking Datum/Bancomm bc635/VME interface" >&5
 # Check whether --enable-BANCOMM or --disable-BANCOMM was given.
 if test "${enable_BANCOMM+set}" = set; then
   enableval="$enable_BANCOMM"
@@ -5781,7 +5782,7 @@
 
 #HPUX only, and only by explicit request
 echo $ac_n "checking TrueTime GPS receiver/VME interface""... $ac_c" 1>&6
-echo "configure:5785: checking TrueTime GPS receiver/VME interface" >&5
+echo "configure:5786: checking TrueTime GPS receiver/VME interface" >&5
 # Check whether --enable-GPSVME or --disable-GPSVME was given.
 if test "${enable_GPSVME+set}" = set; then
   enableval="$enable_GPSVME"
@@ -5804,7 +5805,7 @@
 esac
 
 echo $ac_n "checking for PCL720 clock support""... $ac_c" 1>&6
-echo "configure:5808: checking for PCL720 clock support" >&5
+echo "configure:5809: checking for PCL720 clock support" >&5
 case "$ac_cv_header_machine_inline_h$ac_cv_header_sys_pcl720_h$ac_cv_header_sys_i8253_h" in
  yesyesyes)
     cat >> confdefs.h <<\EOF
@@ -5820,7 +5821,7 @@
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking for SHM clock attached thru shared memory""... $ac_c" 1>&6
-echo "configure:5824: checking for SHM clock attached thru shared memory" >&5
+echo "configure:5825: checking for SHM clock attached thru shared memory" >&5
 # Check whether --enable-SHM or --disable-SHM was given.
 if test "${enable_SHM+set}" = set; then
   enableval="$enable_SHM"
@@ -5839,7 +5840,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking for default inclusion of all suitable non-PARSE clocks""... $ac_c" 1>&6
-echo "configure:5843: checking for default inclusion of all suitable non-PARSE clocks" >&5
+echo "configure:5844: checking for default inclusion of all suitable non-PARSE clocks" >&5
 # Check whether --enable-all-clocks or --disable-all-clocks was given.
 if test "${enable_all_clocks+set}" = set; then
   enableval="$enable_all_clocks"
@@ -5851,7 +5852,7 @@
 echo "$ac_t""$ntp_eac" 1>&6
 
 echo $ac_n "checking if we have support for PARSE clocks""... $ac_c" 1>&6
-echo "configure:5855: checking if we have support for PARSE clocks" >&5
+echo "configure:5856: checking if we have support for PARSE clocks" >&5
 case "$ac_cv_header_termio_h$ac_cv_header_termios_h" in
  *yes*)
     ntp_canparse=yes
@@ -5863,14 +5864,14 @@
 
 # Requires modem control
 echo $ac_n "checking ACTS modem service""... $ac_c" 1>&6
-echo "configure:5867: checking ACTS modem service" >&5
+echo "configure:5868: checking ACTS modem service" >&5
 # Check whether --enable-ACTS or --disable-ACTS was given.
 if test "${enable_ACTS+set}" = set; then
   enableval="$enable_ACTS"
   ntp_ok=$enableval
 else
   cat > conftest.$ac_ext <<EOF
-#line 5874 "configure"
+#line 5875 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef TIOCMBIS
@@ -5900,7 +5901,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Arbiter 1088A/B GPS receiver""... $ac_c" 1>&6
-echo "configure:5904: checking Arbiter 1088A/B GPS receiver" >&5
+echo "configure:5905: checking Arbiter 1088A/B GPS receiver" >&5
 # Check whether --enable-ARBITER or --disable-ARBITER was given.
 if test "${enable_ARBITER+set}" = set; then
   enableval="$enable_ARBITER"
@@ -5919,7 +5920,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Arcron MSF receiver""... $ac_c" 1>&6
-echo "configure:5923: checking Arcron MSF receiver" >&5
+echo "configure:5924: checking Arcron MSF receiver" >&5
 # Check whether --enable-ARCRON_MSF or --disable-ARCRON_MSF was given.
 if test "${enable_ARCRON_MSF+set}" = set; then
   enableval="$enable_ARCRON_MSF"
@@ -5938,7 +5939,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Austron 2200A/2201A GPS receiver""... $ac_c" 1>&6
-echo "configure:5942: checking Austron 2200A/2201A GPS receiver" >&5
+echo "configure:5943: checking Austron 2200A/2201A GPS receiver" >&5
 # Check whether --enable-AS2201 or --disable-AS2201 was given.
 if test "${enable_AS2201+set}" = set; then
   enableval="$enable_AS2201"
@@ -5957,7 +5958,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking PPS interface""... $ac_c" 1>&6
-echo "configure:5961: checking PPS interface" >&5
+echo "configure:5962: checking PPS interface" >&5
 # Check whether --enable-ATOM or --disable-ATOM was given.
 if test "${enable_ATOM+set}" = set; then
   enableval="$enable_ATOM"
@@ -5976,7 +5977,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking CHU modem/decoder""... $ac_c" 1>&6
-echo "configure:5980: checking CHU modem/decoder" >&5
+echo "configure:5981: checking CHU modem/decoder" >&5
 # Check whether --enable-CHU or --disable-CHU was given.
 if test "${enable_CHU+set}" = set; then
   enableval="$enable_CHU"
@@ -6005,7 +6006,7 @@
 
 # Not under HP-UX
 echo $ac_n "checking Datum Programmable Time System""... $ac_c" 1>&6
-echo "configure:6009: checking Datum Programmable Time System" >&5
+echo "configure:6010: checking Datum Programmable Time System" >&5
 # Check whether --enable-DATUM or --disable-DATUM was given.
 if test "${enable_DATUM+set}" = set; then
   enableval="$enable_DATUM"
@@ -6031,14 +6032,14 @@
 
 # Requires modem control
 echo $ac_n "checking Heath GC-1000 WWV/WWVH receiver""... $ac_c" 1>&6
-echo "configure:6035: checking Heath GC-1000 WWV/WWVH receiver" >&5
+echo "configure:6036: checking Heath GC-1000 WWV/WWVH receiver" >&5
 # Check whether --enable-HEATH or --disable-HEATH was given.
 if test "${enable_HEATH+set}" = set; then
   enableval="$enable_HEATH"
   ntp_ok=$enableval
 else
   cat > conftest.$ac_ext <<EOF
-#line 6042 "configure"
+#line 6043 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef TIOCMBIS
@@ -6068,7 +6069,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking HP 58503A GPS receiver""... $ac_c" 1>&6
-echo "configure:6072: checking HP 58503A GPS receiver" >&5
+echo "configure:6073: checking HP 58503A GPS receiver" >&5
 # Check whether --enable-HPGPS or --disable-HPGPS was given.
 if test "${enable_HPGPS+set}" = set; then
   enableval="$enable_HPGPS"
@@ -6087,7 +6088,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking Sun IRIG audio decoder""... $ac_c" 1>&6
-echo "configure:6091: checking Sun IRIG audio decoder" >&5
+echo "configure:6092: checking Sun IRIG audio decoder" >&5
 # Check whether --enable-IRIG or --disable-IRIG was given.
 if test "${enable_IRIG+set}" = set; then
   enableval="$enable_IRIG"
@@ -6115,7 +6116,7 @@
 esac
 
 echo $ac_n "checking Leitch CSD 5300 Master Clock System Driver""... $ac_c" 1>&6
-echo "configure:6119: checking Leitch CSD 5300 Master Clock System Driver" >&5
+echo "configure:6120: checking Leitch CSD 5300 Master Clock System Driver" >&5
 # Check whether --enable-LEITCH or --disable-LEITCH was given.
 if test "${enable_LEITCH+set}" = set; then
   enableval="$enable_LEITCH"
@@ -6134,7 +6135,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking local clock reference""... $ac_c" 1>&6
-echo "configure:6138: checking local clock reference" >&5
+echo "configure:6139: checking local clock reference" >&5
 # Check whether --enable-LOCAL-CLOCK or --disable-LOCAL-CLOCK was given.
 if test "${enable_LOCAL_CLOCK+set}" = set; then
   enableval="$enable_LOCAL_CLOCK"
@@ -6153,7 +6154,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking EES M201 MSF receiver""... $ac_c" 1>&6
-echo "configure:6157: checking EES M201 MSF receiver" >&5
+echo "configure:6158: checking EES M201 MSF receiver" >&5
 # Check whether --enable-MSFEES or --disable-MSFEES was given.
 if test "${enable_MSFEES+set}" = set; then
   enableval="$enable_MSFEES"
@@ -6176,7 +6177,7 @@
 
 # Not Ultrix
 echo $ac_n "checking Magnavox MX4200 GPS receiver""... $ac_c" 1>&6
-echo "configure:6180: checking Magnavox MX4200 GPS receiver" >&5
+echo "configure:6181: checking Magnavox MX4200 GPS receiver" >&5
 # Check whether --enable-MX4200 or --disable-MX4200 was given.
 if test "${enable_MX4200+set}" = set; then
   enableval="$enable_MX4200"
@@ -6204,7 +6205,7 @@
 
 # Not Ultrix
 echo $ac_n "checking Rockwell Jupiter GPS receiver""... $ac_c" 1>&6
-echo "configure:6208: checking Rockwell Jupiter GPS receiver" >&5
+echo "configure:6209: checking Rockwell Jupiter GPS receiver" >&5
 # Check whether --enable-JUPITER or --disable-JUPITER was given.
 if test "${enable_JUPITER+set}" = set; then
   enableval="$enable_JUPITER"
@@ -6231,7 +6232,7 @@
 esac
 
 echo $ac_n "checking NMEA GPS receiver""... $ac_c" 1>&6
-echo "configure:6235: checking NMEA GPS receiver" >&5
+echo "configure:6236: checking NMEA GPS receiver" >&5
 # Check whether --enable-NMEA or --disable-NMEA was given.
 if test "${enable_NMEA+set}" = set; then
   enableval="$enable_NMEA"
@@ -6250,7 +6251,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking PST/Traconex 1020 WWV/WWVH receiver""... $ac_c" 1>&6
-echo "configure:6254: checking PST/Traconex 1020 WWV/WWVH receiver" >&5
+echo "configure:6255: checking PST/Traconex 1020 WWV/WWVH receiver" >&5
 # Check whether --enable-PST or --disable-PST was given.
 if test "${enable_PST+set}" = set; then
   enableval="$enable_PST"
@@ -6270,14 +6271,14 @@
 
 # Requires modem control
 echo $ac_n "checking PTB modem service""... $ac_c" 1>&6
-echo "configure:6274: checking PTB modem service" >&5
+echo "configure:6275: checking PTB modem service" >&5
 # Check whether --enable-PTBACTS or --disable-PTBACTS was given.
 if test "${enable_PTBACTS+set}" = set; then
   enableval="$enable_PTBACTS"
   ntp_ok=$enableval
 else
   cat > conftest.$ac_ext <<EOF
-#line 6281 "configure"
+#line 6282 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef TIOCMBIS
@@ -6307,7 +6308,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking KSI/Odetics TPRO/S GPS receiver/IRIG interface""... $ac_c" 1>&6
-echo "configure:6311: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" >&5
+echo "configure:6312: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" >&5
 # Check whether --enable-TPRO or --disable-TPRO was given.
 if test "${enable_TPRO+set}" = set; then
   enableval="$enable_TPRO"
@@ -6335,7 +6336,7 @@
 esac
 
 echo $ac_n "checking TRAK 8810 GPS receiver""... $ac_c" 1>&6
-echo "configure:6339: checking TRAK 8810 GPS receiver" >&5
+echo "configure:6340: checking TRAK 8810 GPS receiver" >&5
 # Check whether --enable-TRAK or --disable-TRAK was given.
 if test "${enable_TRAK+set}" = set; then
   enableval="$enable_TRAK"
@@ -6355,7 +6356,7 @@
 
 # Not on a vax-dec-bsd
 echo $ac_n "checking Kinemetrics/TrueTime receivers""... $ac_c" 1>&6
-echo "configure:6359: checking Kinemetrics/TrueTime receivers" >&5
+echo "configure:6360: checking Kinemetrics/TrueTime receivers" >&5
 # Check whether --enable-TRUETIME or --disable-TRUETIME was given.
 if test "${enable_TRUETIME+set}" = set; then
   enableval="$enable_TRUETIME"
@@ -6384,7 +6385,7 @@
 esac
 
 echo $ac_n "checking Spectracom 8170/Netclock/2 WWVB receiver""... $ac_c" 1>&6
-echo "configure:6388: checking Spectracom 8170/Netclock/2 WWVB receiver" >&5
+echo "configure:6389: checking Spectracom 8170/Netclock/2 WWVB receiver" >&5
 # Check whether --enable-WWVB or --disable-WWVB was given.
 if test "${enable_WWVB+set}" = set; then
   enableval="$enable_WWVB"
@@ -6404,14 +6405,14 @@
 
 # Requires modem control
 echo $ac_n "checking USNO modem service""... $ac_c" 1>&6
-echo "configure:6408: checking USNO modem service" >&5
+echo "configure:6409: checking USNO modem service" >&5
 # Check whether --enable-USNO or --disable-USNO was given.
 if test "${enable_USNO+set}" = set; then
   enableval="$enable_USNO"
   ntp_ok=$enableval
 else
   cat > conftest.$ac_ext <<EOF
-#line 6415 "configure"
+#line 6416 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef TIOCMBIS
@@ -6441,7 +6442,7 @@
 echo "$ac_t""$ntp_ok" 1>&6
 
 echo $ac_n "checking for default inclusion of all suitable PARSE clocks""... $ac_c" 1>&6
-echo "configure:6445: checking for default inclusion of all suitable PARSE clocks" >&5
+echo "configure:6446: checking for default inclusion of all suitable PARSE clocks" >&5
 # Check whether --enable-parse-clocks or --disable-parse-clocks was given.
 if test "${enable_parse_clocks+set}" = set; then
   enableval="$enable_parse_clocks"
@@ -6467,7 +6468,7 @@
 ntp_rawdcf=no
 
 echo $ac_n "checking Diem Computime Radio Clock""... $ac_c" 1>&6
-echo "configure:6471: checking Diem Computime Radio Clock" >&5
+echo "configure:6472: checking Diem Computime Radio Clock" >&5
 # Check whether --enable-COMPUTIME or --disable-COMPUTIME was given.
 if test "${enable_COMPUTIME+set}" = set; then
   enableval="$enable_COMPUTIME"
@@ -6492,7 +6493,7 @@
 esac
 
 echo $ac_n "checking ELV/DCF7000 clock""... $ac_c" 1>&6
-echo "configure:6496: checking ELV/DCF7000 clock" >&5
+echo "configure:6497: checking ELV/DCF7000 clock" >&5
 # Check whether --enable-DCF7000 or --disable-DCF7000 was given.
 if test "${enable_DCF7000+set}" = set; then
   enableval="$enable_DCF7000"
@@ -6517,7 +6518,7 @@
 esac
 
 echo $ac_n "checking HOPF 6021 clock""... $ac_c" 1>&6
-echo "configure:6521: checking HOPF 6021 clock" >&5
+echo "configure:6522: checking HOPF 6021 clock" >&5
 # Check whether --enable-HOPF6021 or --disable-HOPF6021 was given.
 if test "${enable_HOPF6021+set}" = set; then
   enableval="$enable_HOPF6021"
@@ -6542,7 +6543,7 @@
 esac
 
 echo $ac_n "checking Meinberg clocks""... $ac_c" 1>&6
-echo "configure:6546: checking Meinberg clocks" >&5
+echo "configure:6547: checking Meinberg clocks" >&5
 # Check whether --enable-MEINBERG or --disable-MEINBERG was given.
 if test "${enable_MEINBERG+set}" = set; then
   enableval="$enable_MEINBERG"
@@ -6567,7 +6568,7 @@
 esac
 
 echo $ac_n "checking DCF77 raw time code""... $ac_c" 1>&6
-echo "configure:6571: checking DCF77 raw time code" >&5
+echo "configure:6572: checking DCF77 raw time code" >&5
 # Check whether --enable-RAWDCF or --disable-RAWDCF was given.
 if test "${enable_RAWDCF+set}" = set; then
   enableval="$enable_RAWDCF"
@@ -6596,7 +6597,7 @@
 case "$ntp_rawdcf" in
  yes)
     echo $ac_n "checking if we must enable parity for RAWDCF""... $ac_c" 1>&6
-echo "configure:6600: checking if we must enable parity for RAWDCF" >&5
+echo "configure:6601: checking if we must enable parity for RAWDCF" >&5
 if eval "test \"`echo '$''{'ac_cv_var_rawdcf_parity'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6618,7 +6619,7 @@
     esac
 
     echo $ac_n "checking if we are powering the DCF77 from DTR""... $ac_c" 1>&6
-echo "configure:6622: checking if we are powering the DCF77 from DTR" >&5
+echo "configure:6623: checking if we are powering the DCF77 from DTR" >&5
 if eval "test \"`echo '$''{'ac_cv_var_dtr_powers_dcf77'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6646,7 +6647,7 @@
 esac
 
 echo $ac_n "checking RCC 8000 clock""... $ac_c" 1>&6
-echo "configure:6650: checking RCC 8000 clock" >&5
+echo "configure:6651: checking RCC 8000 clock" >&5
 # Check whether --enable-RCC8000 or --disable-RCC8000 was given.
 if test "${enable_RCC8000+set}" = set; then
   enableval="$enable_RCC8000"
@@ -6671,7 +6672,7 @@
 esac
 
 echo $ac_n "checking Schmid DCF77 clock""... $ac_c" 1>&6
-echo "configure:6675: checking Schmid DCF77 clock" >&5
+echo "configure:6676: checking Schmid DCF77 clock" >&5
 # Check whether --enable-SCHMID or --disable-SCHMID was given.
 if test "${enable_SCHMID+set}" = set; then
   enableval="$enable_SCHMID"
@@ -6696,7 +6697,7 @@
 esac
 
 echo $ac_n "checking Trimble GPS receiver/TAIP protocol""... $ac_c" 1>&6
-echo "configure:6700: checking Trimble GPS receiver/TAIP protocol" >&5
+echo "configure:6701: checking Trimble GPS receiver/TAIP protocol" >&5
 # Check whether --enable-TRIMTAIP or --disable-TRIMTAIP was given.
 if test "${enable_TRIMTAIP+set}" = set; then
   enableval="$enable_TRIMTAIP"
@@ -6721,7 +6722,7 @@
 esac
 
 echo $ac_n "checking Trimble GPS receiver/TSIP protocol""... $ac_c" 1>&6
-echo "configure:6725: checking Trimble GPS receiver/TSIP protocol" >&5
+echo "configure:6726: checking Trimble GPS receiver/TSIP protocol" >&5
 # Check whether --enable-TRIMTSIP or --disable-TRIMTSIP was given.
 if test "${enable_TRIMTSIP+set}" = set; then
   enableval="$enable_TRIMTSIP"
@@ -6748,7 +6749,7 @@
 
 
 echo $ac_n "checking if we need to make and use the parse libraries""... $ac_c" 1>&6
-echo "configure:6752: checking if we need to make and use the parse libraries" >&5
+echo "configure:6753: checking if we need to make and use the parse libraries" >&5
 ans=no
 case "$ntp_libparse" in
  yes)
@@ -6766,7 +6767,7 @@
 
 
 echo $ac_n "checking if we need dcf parse utilities""... $ac_c" 1>&6
-echo "configure:6770: checking if we need dcf parse utilities" >&5
+echo "configure:6771: checking if we need dcf parse utilities" >&5
 ans=no
 if test "$ntp_parseutil" = "yes"; then
     case "$target" in
@@ -6781,7 +6782,7 @@
 
 
 echo $ac_n "checking if we can build kernel streams modules for parse""... $ac_c" 1>&6
-echo "configure:6785: checking if we can build kernel streams modules for parse" >&5
+echo "configure:6786: checking if we can build kernel streams modules for parse" >&5
 ans=no
 if test "$ntp_parseutil$ac_cv_header_sys_stropts_h" = "yesyes"; then
     case "$target" in
@@ -6806,7 +6807,7 @@
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking if we need basic refclock support""... $ac_c" 1>&6
-echo "configure:6810: checking if we need basic refclock support" >&5
+echo "configure:6811: checking if we need basic refclock support" >&5
 if test "$ntp_refclock" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define REFCLOCK 1
@@ -6818,7 +6819,7 @@
 			
 
 echo $ac_n "checking if we want HP-UX adjtimed support""... $ac_c" 1>&6
-echo "configure:6822: checking if we want HP-UX adjtimed support" >&5
+echo "configure:6823: checking if we want HP-UX adjtimed support" >&5
 case "$target" in
  *-*-hpux[56789]*)
     ans=yes
@@ -6836,7 +6837,7 @@
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking if we can read kmem""... $ac_c" 1>&6
-echo "configure:6840: checking if we can read kmem" >&5
+echo "configure:6841: checking if we can read kmem" >&5
 if eval "test \"`echo '$''{'ac_cv_var_can_kmem'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6889,7 +6890,7 @@
 esac
 
 echo $ac_n "checking if adjtime is accurate""... $ac_c" 1>&6
-echo "configure:6893: checking if adjtime is accurate" >&5
+echo "configure:6894: checking if adjtime is accurate" >&5
 if eval "test \"`echo '$''{'ac_cv_var_adjtime_is_accurate'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6941,7 +6942,7 @@
 esac
 
 echo $ac_n "checking the name of 'tick' in the kernel""... $ac_c" 1>&6
-echo "configure:6945: checking the name of 'tick' in the kernel" >&5
+echo "configure:6946: checking the name of 'tick' in the kernel" >&5
 if eval "test \"`echo '$''{'ac_cv_var_nlist_tick'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6985,7 +6986,7 @@
 esac
 #
 echo $ac_n "checking for the units of 'tick'""... $ac_c" 1>&6
-echo "configure:6989: checking for the units of 'tick'" >&5
+echo "configure:6990: checking for the units of 'tick'" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tick_nano'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7009,7 +7010,7 @@
 esac
 #
 echo $ac_n "checking the name of 'tickadj' in the kernel""... $ac_c" 1>&6
-echo "configure:7013: checking the name of 'tickadj' in the kernel" >&5
+echo "configure:7014: checking the name of 'tickadj' in the kernel" >&5
 if eval "test \"`echo '$''{'ac_cv_var_nlist_tickadj'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7062,7 +7063,7 @@
 esac
 #
 echo $ac_n "checking for the units of 'tickadj'""... $ac_c" 1>&6
-echo "configure:7066: checking for the units of 'tickadj'" >&5
+echo "configure:7067: checking for the units of 'tickadj'" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tickadj_nano'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7086,7 +7087,7 @@
 esac
 #
 echo $ac_n "checking half-heartedly for 'dosynctodr' in the kernel""... $ac_c" 1>&6
-echo "configure:7090: checking half-heartedly for 'dosynctodr' in the kernel" >&5
+echo "configure:7091: checking half-heartedly for 'dosynctodr' in the kernel" >&5
 if eval "test \"`echo '$''{'ac_cv_var_nlist_dosynctodr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7139,7 +7140,7 @@
 esac
 #
 echo $ac_n "checking half-heartedly for 'noprintf' in the kernel""... $ac_c" 1>&6
-echo "configure:7143: checking half-heartedly for 'noprintf' in the kernel" >&5
+echo "configure:7144: checking half-heartedly for 'noprintf' in the kernel" >&5
 if eval "test \"`echo '$''{'ac_cv_var_nlist_noprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7189,7 +7190,7 @@
 
 
 echo $ac_n "checking for a default value for 'tick'""... $ac_c" 1>&6
-echo "configure:7193: checking for a default value for 'tick'" >&5
+echo "configure:7194: checking for a default value for 'tick'" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tick'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7231,7 +7232,7 @@
 esac
 
 echo $ac_n "checking for a default value for 'tickadj'""... $ac_c" 1>&6
-echo "configure:7235: checking for a default value for 'tickadj'" >&5
+echo "configure:7236: checking for a default value for 'tickadj'" >&5
 if eval "test \"`echo '$''{'ac_cv_var_tickadj'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7342,7 +7343,7 @@
 
 
 echo $ac_n "checking if we want and can make the ntptime utility""... $ac_c" 1>&6
-echo "configure:7346: checking if we want and can make the ntptime utility" >&5
+echo "configure:7347: checking if we want and can make the ntptime utility" >&5
 if eval "test \"`echo '$''{'ac_cv_make_ntptime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7365,7 +7366,7 @@
 esac
 
 echo $ac_n "checking if we want UDP wildcard delivery""... $ac_c" 1>&6
-echo "configure:7369: checking if we want UDP wildcard delivery" >&5
+echo "configure:7370: checking if we want UDP wildcard delivery" >&5
 if eval "test \"`echo '$''{'ac_cv_var_udp_wildcard_delivery'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7433,7 +7434,7 @@
 esac
 
 echo $ac_n "checking if we should always slew the time""... $ac_c" 1>&6
-echo "configure:7437: checking if we should always slew the time" >&5
+echo "configure:7438: checking if we should always slew the time" >&5
 if eval "test \"`echo '$''{'ac_cv_var_slew_always'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7473,7 +7474,7 @@
 esac
 
 echo $ac_n "checking if we should step and slew the time""... $ac_c" 1>&6
-echo "configure:7477: checking if we should step and slew the time" >&5
+echo "configure:7478: checking if we should step and slew the time" >&5
 if eval "test \"`echo '$''{'ac_cv_var_step_slew'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7516,7 +7517,7 @@
 esac
 
 echo $ac_n "checking if ntpdate should step the time""... $ac_c" 1>&6
-echo "configure:7520: checking if ntpdate should step the time" >&5
+echo "configure:7521: checking if ntpdate should step the time" >&5
 if eval "test \"`echo '$''{'ac_cv_var_ntpdate_step'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7547,7 +7548,7 @@
 esac
 
 echo $ac_n "checking if we should sync TODR clock every hour""... $ac_c" 1>&6
-echo "configure:7551: checking if we should sync TODR clock every hour" >&5
+echo "configure:7552: checking if we should sync TODR clock every hour" >&5
 if eval "test \"`echo '$''{'ac_cv_var_sync_todr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff -urN xntp3-5.93c/configure.in xntp3-5.93d/configure.in
--- xntp3-5.93c/configure.in	Mon Aug 10 18:57:56 1998
+++ xntp3-5.93d/configure.in	Tue Jun 23 22:10:29 1998
@@ -1,7 +1,7 @@
 dnl -*-fundamental-*-
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(xntpd/ntp_refclock.c)
-AM_INIT_AUTOMAKE(xntp3, 5.93c)
+AM_INIT_AUTOMAKE(xntp3, 5.93d)
 AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
@@ -1002,12 +1002,13 @@
 
 AC_CACHE_CHECK(if we have kernel PLL support, ac_cv_var_kernel_pll,
 [dnl ac_cv_var_ntp_syscalls is {no,libc,kernel}
+changequote(<<, >>)dnl
 case "$ac_cv_header_sys_timex_h$ac_cv_var_sta_fll$ac_cv_var_ntp_syscalls" in
  *no*)
     ac_cv_var_kernel_pll=no
     ;;
  *) case "$target" in
-     *-*-solaris2.6)
+     *-*-solaris2.[67])
 	# Broken...
 	ac_cv_var_kernel_pll=no
 	;;
@@ -1015,7 +1016,9 @@
 	;;
     esac
     ;;
-esac])
+ esac
+changequote([, ])dnl
+])
 case "$ac_cv_var_kernel_pll" in
  yes)
     AC_DEFINE(KERNEL_PLL)
diff -urN xntp3-5.93c/html/copyright.html.orig xntp3-5.93d/html/copyright.html.orig
--- xntp3-5.93c/html/copyright.html.orig
+++ xntp3-5.93d/html/copyright.html.orig	Wed Apr 15 03:01:14 1998
@@ -0,0 +1,142 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML Strict//EN">
+<html><head><title>
+Copyright Notice
+</title></head><body><h3>
+Copyright Notice
+</h3><hr>
+
+<p>The following copyright notice applies to all files collectively
+called the Network Time Protocol Version 3 Distribution. Unless
+specifically declared otherwise in an individual file, this notice
+applies as if the text was explicitly included in the file.
+
+<pre>
+
+/***********************************************************************
+ *                                                                     *
+ * Copyright (c) David L. Mills 1992, 1993, 1994, 1995, 1996, 1997     *
+ *                                                                     *
+ * Permission to use, copy, modify, and distribute this software and   *
+ * its documentation for any purpose and without fee is hereby         *
+ * granted, provided that the above copyright notice appears in all    *
+ * copies and that both the copyright notice and this permission       *
+ * notice appear in supporting documentation, and that the name        *
+ * University of Delaware not be used in advertising or publicity      *
+ * pertaining to distribution of the software without specific,        *
+ * written prior permission. The University of Delaware makes no       *
+ * representations about the suitability this software for any         *
+ * purpose. It is provided "as is" without express or implied          *
+ * warranty.                                                           *
+ **********************************************************************/
+
+</pre>
+
+<p>The following individuals contributed in part to the Network Time
+Protocol Distribution Version 4 and are acknowledged as authors of this
+work.
+
+<ol>
+
+<li>Mark Andrews &lt;marka@syd.dms.csiro.au&gt; Leitch atomic clock
+controller
+
+<br><li>Viraj Bais &lt;vbais@mailman1.intel.com&gt; and Clayton Kirkwood
+&lt;kirkwood@striderfm.intel.com&gt; port to WindowsNT 3.5
+
+<br><li>Karl Berry &lt;karl@owl.HQ.ileaf.com&gt; syslog to file option
+
+<br><li>Piete Brooks &lt;Piete.Brooks@cl.cam.ac.uk&gt; MSF clock driver,
+Trimble PARSE support
+
+<br><li>Steve Clift &lt;clift@ml.csiro.au&gt;: OMEGA clock driver
+
+<br><li><a href="http://www.ee.uct.ac.za/~casey"> Casey Crellin </a>
+        <a href="mailto:casey@csc.co.za"> (casey@csc.co.za) </a>
+	vxWorks (Tornado) port and help with target configuration
+
+<br><li>Torsten Duwe &lt;duwe@immd4.informatik.uni-erlangen.de&gt; Linux
+Port
+
+<br><li>John A. Dundas III &lt;dundas@salt.jpl.nasa.gov&gt; Apple A/UX
+port
+
+<br><li>Dennis Ferguson &lt;dennis@mrbill.canet.ca&gt; foundation code
+for NTP Version 2 as specified in RFC-1119
+
+<br><li>Glenn Hollinger &lt;glenn@herald.usask.ca&gt; GOES clock driver
+
+<br><li>Mike Iglesias &lt;iglesias@uci.edu&gt;: DEC Alpha port
+
+<br><li>Jim Jagielski &lt;jim@jagubox.gsfc.nasa.gov&gt; A/UX port
+<br><li>Jeff Johnson &lt;jbj@chatham.usdesign.com&gt; massive
+prototyping overhaul
+
+<br><li>William L. Jones &lt;jones@hermes.chpc.utexas.edu&gt; RS/6000
+AIX modifications, HPUX modifications
+
+<br><li>Dave Katz &lt;dkatz@cisco.com&gt; RS/6000 AIX port
+
+<br><li>Craig Leres &lt;leres@ee.lbl.gov&gt; 4.4BSD port, ppsclock,
+Maganavox GPS clock driver
+
+<br><li>George Lindholm &lt;lindholm@ucs.ubc.ca&gt; SunOS 5.1 port
+
+<br><li>Louis A. Mamakos &lt;louie@ni.umd.edu&gt; MD5-based
+authentication
+
+<br><li>Derek Mulcahy &lt;derek@toybox.demon.co.uk&gt and Damon Hart-Davis
+&lt;d@hd.org&gt: ARCRON MSF clock driver
+
+<br><li>Lars H. Mathiesen &lt;thorinn@diku.dk&gt; adaptation of
+foundation code for Version 3 as specified in RFC-1305
+
+<br><li><a href="http://www.eecis.udel.edu/~mills">David L. Mills
+&lt;mills@udel.edu&gt;</a> Spectractom WWVB, Austron GPS, Arbiter GPS,
+Heath, ATOM, ACTS, KSI/Odetics IRIG-B clock drivers; PPS support
+
+<br><li>Wolfgang Moeller &lt;moeller@gwdgv1.dnet.gwdg.de&gt; VMS port
+
+<br><li>Jeffrey Mogul &lt;mogul@pa.dec.com&gt; ntptrace utility
+
+<br><li>Tom Moore &lt;tmoore@fievel.daytonoh.ncr.com&gt; i386 svr4 port
+
+<br><li>Rainer Pruy &lt;Rainer.Pruy@informatik.uni-erlangen.de&gt;
+monitoring/trap scripts, statistics file handling
+
+<br><li>Dirce Richards &lt;dirce@zk3.dec.com&gt; Digital UNIX V4.0 port
+
+<br><li>Nick Sayer &lt;mrapple@quack.kfu.com&gt; SunOS streams modules
+
+<br><li><a href="http://www4.informatik.uni-erlangen.de/~kardel">Frank Kardel</a>
+<a href="mailto: Frank.Kardel@informatik.uni-erlangen.de"> &lt;Frank.Kardel@informatik.uni-erlangen.de&gt;</a>
+PARSE &lt;GENERIC&gt; driver (14 reference clocks), STREAMS modules for PARSE, support
+scripts, syslog cleanup
+
+<br><li>Ray Schnitzler &lt;schnitz@unipress.com&gt; Unixware1 port
+
+<br><li>Michael Shields &lt;shields@tembel.org&gt; USNO clock driver
+
+<br><li>Jeff Steinman &lt;jss@pebbles.jpl.nasa.gov&gt; Datum PTS clock
+driver
+
+<br><li>Harlan Stenn &lt;harlan@pfcs.com&gt; GNU automake/autoconfigure
+makeover
+
+<br><li>Kenneth Stone &lt;ken@sdd.hp.com&gt; HP-UX port
+
+<br><li><a href="http://www.eecis.udel.edu/~ajit">Ajit Thyagarajan
+&lt;ajit@ee.udel.edu&gt;</a> IP multicast support
+
+<br><li>Tomoaki TSURUOKA &lt;tsuruoka@nc.fukuoka-u.ac.jp&gt; TRAK clock
+driver
+
+<br><li>Paul A Vixie &lt;vixie@vix.com&gt; TrueTime GPS driver, generic
+TrueTime clock driver
+
+<li>Ulrich Windl &lt;Ulrich.Windl@rz.uni-regensburg.de&gt; Corrected and
+validated HTML documents according to the HTML DTD
+
+</ol>
+
+<hr><address>David L. Mills
+&lt;mills@udel.edu&gt;</address></body></html>
diff -urN xntp3-5.93c/include/Makefile.in xntp3-5.93d/include/Makefile.in
--- xntp3-5.93c/include/Makefile.in	Sat Apr 25 18:19:39 1998
+++ xntp3-5.93d/include/Makefile.in	Tue Jun 23 22:19:17 1998
@@ -140,7 +140,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/kernel/Makefile.in xntp3-5.93d/kernel/Makefile.in
--- xntp3-5.93c/kernel/Makefile.in	Sat Apr 25 18:22:25 1998
+++ xntp3-5.93d/kernel/Makefile.in	Tue Jun 23 22:20:08 1998
@@ -174,7 +174,7 @@
 	done; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/kernel/sys/Makefile.in xntp3-5.93d/kernel/sys/Makefile.in
--- xntp3-5.93c/kernel/sys/Makefile.in	Sat Apr 25 18:22:33 1998
+++ xntp3-5.93d/kernel/sys/Makefile.in	Tue Jun 23 22:20:10 1998
@@ -139,7 +139,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/libntp/Makefile.in xntp3-5.93d/libntp/Makefile.in
--- xntp3-5.93c/libntp/Makefile.in	Sat Apr 25 18:19:59 1998
+++ xntp3-5.93d/libntp/Makefile.in	Tue Jun 23 22:19:27 1998
@@ -210,7 +210,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/libparse/Makefile.in xntp3-5.93d/libparse/Makefile.in
--- xntp3-5.93c/libparse/Makefile.in	Sat Apr 25 18:20:35 1998
+++ xntp3-5.93d/libparse/Makefile.in	Tue Jun 23 22:19:38 1998
@@ -226,7 +226,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/ntpdate/Makefile.in xntp3-5.93d/ntpdate/Makefile.in
--- xntp3-5.93c/ntpdate/Makefile.in	Sat Apr 25 18:21:02 1998
+++ xntp3-5.93d/ntpdate/Makefile.in	Tue Jun 23 22:19:46 1998
@@ -207,7 +207,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/ntpq/Makefile.in xntp3-5.93d/ntpq/Makefile.in
--- xntp3-5.93c/ntpq/Makefile.in	Sat Apr 25 18:21:10 1998
+++ xntp3-5.93d/ntpq/Makefile.in	Tue Jun 23 22:19:48 1998
@@ -208,7 +208,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/ntptrace/Makefile.in xntp3-5.93d/ntptrace/Makefile.in
--- xntp3-5.93c/ntptrace/Makefile.in	Sat Apr 25 18:21:19 1998
+++ xntp3-5.93d/ntptrace/Makefile.in	Tue Jun 23 22:19:50 1998
@@ -207,7 +207,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/parseutil/Makefile.in xntp3-5.93d/parseutil/Makefile.in
--- xntp3-5.93c/parseutil/Makefile.in	Sat Apr 25 18:21:28 1998
+++ xntp3-5.93d/parseutil/Makefile.in	Tue Jun 23 22:19:53 1998
@@ -193,7 +193,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/patches/done/191 xntp3-5.93d/patches/done/191
--- xntp3-5.93c/patches/done/191
+++ xntp3-5.93d/patches/done/191	Wed Apr 29 19:24:15 1998
@@ -0,0 +1,129 @@
+Replied: Tue, 28 Apr 1998 16:07:14 -0400
+Replied: "Kamal A Mostafa <kamal@images.com> "
+Received: from mail.eecis.udel.edu by whimsy.udel.edu id aa13709;
+          28 Apr 1998 02:27 EDT
+Received: from green.images.com (green.images.com [198.207.178.4]) by orange.images.com (8.8.5/SCO5) with ESMTP id XAA16947; Mon, 27 Apr 1998 23:26:55 -0700 (PDT)
+Received: (from kamal@localhost) by green.images.com (8.8.5/SCO5) id XAA00282; Mon, 27 Apr 1998 23:26:54 -0700 (PDT)
+Message-ID: <19980427232654.24285@images.com>
+Date: Mon, 27 Apr 1998 23:26:54 -0700
+From: Kamal A Mostafa <kamal@images.com>
+To: stenn@whimsy.udel.edu
+Cc: Kamal A Mostafa <kamal@images.com>
+Subject: 5.93: bug in my new TIMER_DEQUEUE()
+References: <19980403225715.03704@green>
+Mime-Version: 1.0
+Content-Type: multipart/mixed; boundary=82I3+IH0IqGh5yIs
+X-Mailer: Mutt 0.89i+KAM
+In-Reply-To: <19980403225715.03704@green>; from Kamal A Mostafa on Fri, Apr 03, 1998 at 10:57:15PM -0800
+
+
+--82I3+IH0IqGh5yIs
+Content-Type: text/plain; charset=us-ascii
+
+Hi Harlan-
+
+Looks like one of my patches got lost in the shuffle...  5.93 contains
+my first (buggy) version of TIMER_DEQUEUE().  Luckily, this stuff only
+gets used with -DDEBUG_TIMERQUEUE anyway, so this isn't a showstopper
+or anything.
+
+Anyway... Here's another copy of the mail I sent you when I discovered it,
+detailing the issue.  New patch to 5.93 xntpd/ntp_timer.c attached.
+(Sorry 'bout this!)
+
+ -k
+
+On Fri, Apr 03, 1998 at 10:57:15PM -0800, Kamal A Mostafa wrote:
+> -----BEGIN PGP SIGNED MESSAGE-----
+> 
+> Back to work...  I discovered a bug in my new xntpd TIMER_DEQUEUE() function
+> (only affects a binary compiled with -DDEBUG_TIMERQUEUE).
+> 
+> New patch attached to fix it (needs to be applied on top of my first
+> TIMERQUEUE patch) -- or just modify ntp_timer.c manually, details here:
+> 
+> Here's what I had coded (bottom of ntp_timer.c)...
+> 
+> 	void TIMER_DEQUEUE(struct event *ev)
+> 	{
+> 		EV_LINKCHK( ev, "TIMER_DEQUEUE(): ev" );
+> 		WINNT_WAIT();
+> 		if ((ev)->next != 0) {
+> 			(ev)->next->prev = (ev)->prev;
+> 			(ev)->prev->next = (ev)->next;
+> 			(ev)->next = (ev)->prev = 0;
+> 		}
+> 		WINNT_RELS();
+> 	}
+> 
+> Alas, there is at least one normal situation where TIMER_DEQUEUE() gets
+> passed an 'ev' which isn't actually queued (through peer_clear()).
+> Which is why TIMER_DEQUEUE() cleverly watches out for (ev)->next being != 0.
+> 
+> My EV_LINKCHK() is misplaced -- it shouldn't check the linkage-sanity until
+> it's determined that this 'ev' is actually linked.  It should look like this:
+> 
+> 	void TIMER_DEQUEUE(struct event *ev)
+> 	{
+> 		EV_ASSERT( ev, "TIMER_DEQUEUE(): ev" );		 /* change */
+> 		WINNT_WAIT();
+> 		if ((ev)->next != 0) {
+> 			EV_LINKCHK( ev, "TIMER_DEQUEUE(): ev" ); /* change */
+> 			(ev)->next->prev = (ev)->prev;
+> 			(ev)->prev->next = (ev)->next;
+> 			(ev)->next = (ev)->prev = 0;
+> 		}
+> 		WINNT_RELS();
+> 	}
+> 
+> 
+> Best,
+> 
+>  -k
+> 
+> P.S.  I'm mortified at how similar TIMER_DEQUEUE is to DEBUG_TIMERQUEUE...
+> Their only difference is "BUG".  What does *that* mean?  ;-}
+> 
+
+--82I3+IH0IqGh5yIs
+Content-Type: text/plain; charset=us-ascii
+Content-Description: tqdebug2.patch
+Content-Disposition: attachment; filename="tqdebug2.patch"
+
+*** xntpd/ntp_timer.c.orig Mon Apr 27 23:12:30 1998
+--- xntpd/ntp_timer.c Mon Apr 27 23:20:38 1998
+***************
+*** 542,548 ****
+   */
+  void TIMER_DEQUEUE(struct event *ev)
+  {
+! 	EV_LINKCHK( ev, "TIMER_DEQUEUE(): ev" );
+  	WINNT_WAIT();
+  	if ((ev)->next != 0) {
+  		(ev)->next->prev = (ev)->prev;
+--- 542,548 ----
+   */
+  void TIMER_DEQUEUE(struct event *ev)
+  {
+! 	EV_ASSERT( ev, "TIMER_DEQUEUE(): ev" );
+  	WINNT_WAIT();
+  	if ((ev)->next != 0) {
+  		EV_LINKCHK( ev, "TIMER_DEQUEUE(): ev" );
+***************
+*** 545,550 ****
+  	EV_LINKCHK( ev, "TIMER_DEQUEUE(): ev" );
+  	WINNT_WAIT();
+  	if ((ev)->next != 0) {
+  		(ev)->next->prev = (ev)->prev;
+  		(ev)->prev->next = (ev)->next;
+  		(ev)->next = (ev)->prev = 0;
+--- 545,551 ----
+  	EV_ASSERT( ev, "TIMER_DEQUEUE(): ev" );
+  	WINNT_WAIT();
+  	if ((ev)->next != 0) {
++ 		EV_LINKCHK( ev, "TIMER_DEQUEUE(): ev" );
+  		(ev)->next->prev = (ev)->prev;
+  		(ev)->prev->next = (ev)->next;
+  		(ev)->next = (ev)->prev = 0;
+
+--82I3+IH0IqGh5yIs--
diff -urN xntp3-5.93c/patches/done/192 xntp3-5.93d/patches/done/192
--- xntp3-5.93c/patches/done/192
+++ xntp3-5.93d/patches/done/192	Tue May  5 03:16:34 1998
@@ -0,0 +1,158 @@
+Replied: Tue, 05 May 1998 03:16:34 -0400
+Replied: "Jon Peatfield <J.S.Peatfield@damtp.cam.ac.uk> "
+Replied: Fri, 01 May 1998 11:33:29 -0400
+Replied: "Jon Peatfield <J.S.Peatfield@damtp.cam.ac.uk> ulrich.windl@rz.uni-regensburg.de, I.A.N.Grant@damtp.cam.ac.uk"
+Received: from mail.eecis.udel.edu by whimsy.udel.edu id aa06635;
+          1 May 1998 08:07 EDT
+Received: from jp107 by kro.amtp.cam.ac.uk with smtp (Exim 1.73 #2)
+	id 0yVEZm-0001nz-00; Fri, 1 May 1998 13:06:03 +0100
+X-Mailer: exmh version 1.5.1 12/2/94
+To: stenn@whimsy.udel.edu, ulrich.windl@rz.uni-regensburg.de
+cc: J.S.Peatfield@damtp.cam.ac.uk, I.A.N.Grant@damtp.cam.ac.uk
+Subject: Re: xntp3-5.93 has been released. 
+In-reply-to: Your message of "Tue, 28 Apr 1998 23:05:59 EDT."
+             <24562.893819159@whimsy.udel.edu> 
+Mime-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Date: Fri, 01 May 1998 13:06:00 +0100
+From: Jon Peatfield <J.S.Peatfield@damtp.cam.ac.uk>
+Message-Id: <E0yVEZm-0001nz-00@kro.amtp.cam.ac.uk>
+
+Well I've got a patch for xntpd3-5.93 which makes it build with working 
+kernel-pll for me (on the alpha).  I've not tested this properly with any 
+other Linux yet, but I've just compiled up and am testing an Intel version.  
+(I won't have results for a few hours but it looks good so far).
+
+The Linux kernel needs a minor kernel patch to fix a problem with MAXFREQ on 
+the Alpha, but other than that the xntp3 code is fine.  I'll take a look at 
+the ntp4 code early next week.
+
+The patches and RPM/SRPM can be found at:
+
+   ftp://ftp.damtp.cam.ac.uk/pub/linux/xntp3/
+
+the xntpd3-kernel-pll.patch fixes the configure(.in) to just look for 
+__adjtimex() and uses this for both ntp_adjtime() and ntp_gettime() functions.
+At some point wrappers should be added the the Linux libc to remove the need 
+for all this hackery.
+
+ -- Jon
+
+--cut-here--
+*** xntp3-5.93.orig/configure	Sat Apr 25 23:02:36 1998
+--- xntp3-5.93/configure	Fri May  1 10:22:20 1998
+***************
+*** 3796,3802 ****
+  
+  case "$target" in
+   *-*-linux*)
+!     for ac_func in __adjtimex __ntp_gettime
+  do
+  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+  echo "configure:3803: checking for $ac_func" >&5
+--- 3796,3802 ----
+  
+  case "$target" in
+   *-*-linux*)
+!     for ac_func in __adjtimex
+  do
+  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+  echo "configure:3803: checking for $ac_func" >&5
+***************
+*** 5534,5541 ****
+    echo $ac_n "(cached) $ac_c" 1>&6
+  else
+    ac_cv_var_ntp_syscalls=no
+!  case "$ac_cv_func___adjtimex$ac_cv_func___ntp_gettime" in
+!   yesyes)
+      ac_cv_var_ntp_syscalls=libc
+      ;;
+    *) case "$ac_cv_func_ntp_adjtime$ac_cv_func_ntp_gettime" in
+--- 5534,5541 ----
+    echo $ac_n "(cached) $ac_c" 1>&6
+  else
+    ac_cv_var_ntp_syscalls=no
+!  case "$ac_cv_func___adjtimex" in
+!   yes)
+      ac_cv_var_ntp_syscalls=libc
+      ;;
+    *) case "$ac_cv_func_ntp_adjtime$ac_cv_func_ntp_gettime" in
+*** xntp3-5.93.orig/configure.in	Sat Apr 25 23:01:54 1998
+--- xntp3-5.93/configure.in	Fri May  1 10:24:03 1998
+***************
+*** 404,410 ****
+  
+  case "$target" in
+   *-*-linux*)
+!     AC_CHECK_FUNCS(__adjtimex __ntp_gettime)
+      ;;
+  esac
+  AC_CHECK_FUNCS(clock_settime daemon getbootfile getdtablesize getrusage)
+--- 404,410 ----
+  
+  case "$target" in
+   *-*-linux*)
+!     AC_CHECK_FUNCS(__adjtimex)
+      ;;
+  esac
+  AC_CHECK_FUNCS(clock_settime daemon getbootfile getdtablesize getrusage)
+***************
+*** 963,970 ****
+  
+  AC_CACHE_CHECK([availability of ntp_{adj,get}time()], ac_cv_var_ntp_syscalls,
+   [ac_cv_var_ntp_syscalls=no
+!  case "$ac_cv_func___adjtimex$ac_cv_func___ntp_gettime" in
+!   yesyes)
+      ac_cv_var_ntp_syscalls=libc
+      ;;
+    *) case "$ac_cv_func_ntp_adjtime$ac_cv_func_ntp_gettime" in
+--- 963,970 ----
+  
+  AC_CACHE_CHECK([availability of ntp_{adj,get}time()], ac_cv_var_ntp_syscalls,
+   [ac_cv_var_ntp_syscalls=no
+!  case "$ac_cv_func___adjtimex" in
+!   yes)
+      ac_cv_var_ntp_syscalls=libc
+      ;;
+    *) case "$ac_cv_func_ntp_adjtime$ac_cv_func_ntp_gettime" in
+*** xntp3-5.93.orig/include/ntp_machine.h	Wed Sep 24 04:39:22 1997
+--- xntp3-5.93/include/ntp_machine.h	Fri May  1 10:22:20 1998
+***************
+*** 143,148 ****
+--- 143,151 ----
+   */
+  #if defined(SYS_LINUX)
+  # define ntp_adjtime __adjtimex
++ /* Hack hack hack 1998-Apr-29  JSP */
++ # define ntptimeval timex
++ # define ntp_gettime __adjtimex
+  #endif
+  
+  /*
+*** xntp3-5.93.orig/util/ntptime.c	Wed Sep 24 05:27:00 1997
+--- xntp3-5.93/util/ntptime.c	Fri May  1 10:22:20 1998
+***************
+*** 40,45 ****
+--- 40,48 ----
+  #  endif
+  #  ifdef HAVE___ADJTIMEX
+  #   define ntp_adjtime(t)  __adjtimex((t))
++ /* Hack hack hack 1998-Apr-29  JSP */
++ #   define ntptimeval timex
++ #   define ntp_gettime __adjtimex
+  #  endif
+  # endif /* NOT NTP_SYSCALLS_STD */
+  #endif /* KERNEL_PLL */
+***************
+*** 260,265 ****
+--- 263,269 ----
+    /*
+     * Fetch timekeeping data and display.
+     */
++   ntv.modes=0;
+    status = ntp_gettime(&ntv);
+    if (status < 0)
+      perror("ntp_gettime() call fails");
+--cut-here--
+
+
diff -urN xntp3-5.93c/patches/done/193 xntp3-5.93d/patches/done/193
--- xntp3-5.93c/patches/done/193
+++ xntp3-5.93d/patches/done/193	Fri Jun  5 21:40:35 1998
@@ -0,0 +1,55 @@
+Replied: Fri, 05 Jun 1998 21:18:11 -0400
+Replied: "Marion Hakanson <hakanson@cse.ogi.edu> "
+Received: from mail.eecis.udel.edu by whimsy.udel.edu id aa10223;
+          5 Jun 1998 15:34 EDT
+Received: from cse.ogi.edu (hakanson@church.cse.ogi.edu [129.95.50.2])
+	by church.cse.ogi.edu (8.8.6/8.8.6) with ESMTP id MAA15936
+	for <stenn@whimsy.udel.edu>; Fri, 5 Jun 1998 12:16:44 -0700 (PDT)
+Message-Id: <199806051916.MAA15936@church.cse.ogi.edu>
+X-Mailer: exmh version 1.6.9 8/22/96
+To: stenn@whimsy.udel.edu
+Subject: patch for tickadj, ntp-4.0.72j
+Mime-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Date: Fri, 05 Jun 1998 12:16:44 -0700
+From: Marion Hakanson <hakanson@cse.ogi.edu>
+
+Harlan,
+
+Hope you're still the appropriate person for this.  I was reading
+through the util/tickadj.c code, looking for answers, when I found
+the cut-and-paste-o fixed by the following patch:
+
+------------------------------------------------
+*** util/tickadj.c.orig	Tue Feb 17 21:53:28 1998
+--- util/tickadj.c	Fri Jun  5 12:03:41 1998
+***************
+*** 458,464 ****
+  
+  	fd = openfile(file, O_WRONLY);
+  
+! 	if (setnoprintf && (dosync_offset != 0))
+  	{
+  		if (!quiet)
+  		{
+--- 458,464 ----
+  
+  	fd = openfile(file, O_WRONLY);
+  
+! 	if (setnoprintf && (noprintf_offset != 0))
+  	{
+  		if (!quiet)
+  		{
+------------------------------------------------
+
+I don't know what is at offset 0 in our kernel here, but whatever
+it is, I think it's got a "1" in it now, after I accidentally typed
+a "-p" at tickadj yesterday.  No apparent harm done, though.
+
+Regards,
+
+-- 
+Marion Hakanson <hakanson@cse.ogi.edu>
+Systems Manager, CSE Computing Facilities.
+
+
diff -urN xntp3-5.93c/patches/done/194 xntp3-5.93d/patches/done/194
--- xntp3-5.93c/patches/done/194
+++ xntp3-5.93d/patches/done/194	Fri May 22 16:51:21 1998
@@ -0,0 +1,97 @@
+Replied: Fri, 22 May 1998 16:42:39 -0400
+Replied: "Per Hedeland <per@erix.ericsson.se> "
+Received: from mail.eecis.udel.edu by whimsy.udel.edu id aa00535;
+          22 May 1998 15:43 EDT
+Received: from super.du.etx.ericsson.se (per@super.du.etx.ericsson.se [150.236.14.16]) by penguin.wise.edt.ericsson.se (8.7.5/8.7.3/penguin-1.12) with ESMTP id VAA23895 for <stenn@whimsy.udel.edu>; Fri, 22 May 1998 21:42:37 +0200 (MET DST)
+Received: (from per@localhost)
+	by super.du.etx.ericsson.se (8.9.0/8.9.0/erix-1.4) id VAA06128
+	for stenn@whimsy.udel.edu; Fri, 22 May 1998 21:42:37 +0200 (MET DST)
+Date: Fri, 22 May 1998 21:42:37 +0200 (MET DST)
+From: Per Hedeland <per@erix.ericsson.se>
+Message-Id: <199805221942.VAA06128@super.du.etx.ericsson.se>
+To: stenn@whimsy.udel.edu
+Subject: Re: xntp3-5.93 has been released.
+
+Hi again,
+
+3-5.93c seems to compile:-) and work just fine with the PPS support in
+Solaris 2.6 now (I posted about it to the newsgroup), I just have a
+final suggestion: .93 cleverly avoids the kernel PLL "support" in 2.6
+which is fine, unfortunately it seems pretty clear that the same problem
+exists in 2.7, and I think it would be nice if xntp 3.x "survived" that,
+thus the little patch below.
+
+Solaris 2.7 has been in beta for a while now, and while I haven't had
+the opportunity to try it out myself, I received (indirectly via a guy
+at Sun in Sweden) this info about the PLL problem, from Jan Brittenson
+at Sun (one of the authors of the "standard PPS API" draft):
+
+-----------------
+Yes, the problem is that the interface has to be slightly different in
+Solaris, since we have a variable clock rate.  Most other system have
+a hard-coded clock rate, which means they can use shift counts; we
+have to use scaling factors (e.g. "32" instead of "4").  Some very
+minor changes are necessary to xntpd to work properly on Solaris, but
+I haven't had the opportunity to send these back to Dave Mills.  This,
+in addition to tickling a bug which we'll fix in 2.7, makes the kernel
+PLL appear to behave rather strangely with an xntpd without the right
+modifications.
+-----------------
+
+I.e. while *something* will be fixed in 2.7, modifications to xntpd are
+also needed, and it seems unlikely to me that these will manage to find
+their way into 3.x - if you disagree, you can of course ignore the
+patch, but otherwise I think it makes sense - at least 3.x will then
+(hopefully:-) work no worse on 2.7 than on 2.6.
+
+--Per
+
+*** configure.in.ORIG	Wed May  6 20:02:53 1998
+--- configure.in	Fri May 22 21:32:11 1998
+***************
+*** 1002,1013 ****
+  
+  AC_CACHE_CHECK(if we have kernel PLL support, ac_cv_var_kernel_pll,
+  [dnl ac_cv_var_ntp_syscalls is {no,libc,kernel}
+  case "$ac_cv_header_sys_timex_h$ac_cv_var_sta_fll$ac_cv_var_ntp_syscalls" in
+   *no*)
+      ac_cv_var_kernel_pll=no
+      ;;
+   *) case "$target" in
+!      *-*-solaris2.6)
+  	# Broken...
+  	ac_cv_var_kernel_pll=no
+  	;;
+--- 1002,1014 ----
+  
+  AC_CACHE_CHECK(if we have kernel PLL support, ac_cv_var_kernel_pll,
+  [dnl ac_cv_var_ntp_syscalls is {no,libc,kernel}
++ changequote(<<, >>)dnl
+  case "$ac_cv_header_sys_timex_h$ac_cv_var_sta_fll$ac_cv_var_ntp_syscalls" in
+   *no*)
+      ac_cv_var_kernel_pll=no
+      ;;
+   *) case "$target" in
+!      *-*-solaris2.[67])
+  	# Broken...
+  	ac_cv_var_kernel_pll=no
+  	;;
+***************
+*** 1015,1021 ****
+  	;;
+      esac
+      ;;
+! esac])
+  case "$ac_cv_var_kernel_pll" in
+   yes)
+      AC_DEFINE(KERNEL_PLL)
+--- 1016,1024 ----
+  	;;
+      esac
+      ;;
+!  esac
+! changequote([, ])dnl
+! ])
+  case "$ac_cv_var_kernel_pll" in
+   yes)
+      AC_DEFINE(KERNEL_PLL)
diff -urN xntp3-5.93c/patches/inbox/11 xntp3-5.93d/patches/inbox/11
--- xntp3-5.93c/patches/inbox/11
+++ xntp3-5.93d/patches/inbox/11	Fri May  1 11:34:45 1998
@@ -0,0 +1,92 @@
+Replied: Fri, 01 May 1998 11:31:45 -0400
+Replied: "Per Hedeland <per@erix.ericsson.se> "
+Received: from mail.eecis.udel.edu by whimsy.udel.edu id aa06670;
+          1 May 1998 08:09 EDT
+Received: from super.du.etx.ericsson.se (per@super.du.etx.ericsson.se [150.236.14.16]) by penguin.wise.edt.ericsson.se (8.7.5/8.7.3/penguin-1.12) with ESMTP id OAA11002 for <stenn@whimsy.udel.edu>; Fri, 1 May 1998 14:09:56 +0200 (MET DST)
+Received: (from per@localhost)
+	by super.du.etx.ericsson.se (8.9.0.Beta6/8.9.0.Beta6/erix-1.4) id OAA03368;
+	Fri, 1 May 1998 14:09:56 +0200 (MET DST)
+Date: Fri, 1 May 1998 14:09:56 +0200 (MET DST)
+From: Per Hedeland <per@erix.ericsson.se>
+Message-Id: <199805011209.OAA03368@super.du.etx.ericsson.se>
+To: stenn@whimsy.udel.edu
+Subject: Re: xntp3-5.93 has been released.
+Newsgroups: comp.protocols.time.ntp
+In-Reply-To: <o4wwca7v67.fsf@whimsy.udel.edu>
+
+In article <o4wwca7v67.fsf@whimsy.udel.edu> you write:
+>Again, we will limit changes to portability and bugs only.
+
+>* Jupiter clock added
+
+Well, I don't know whether this was portability or bug:-) (or perhaps
+that policy wasn't applied before), but anyway it breaks compilation
+on Solaris 2.6 when PPS is #defined (I just recently figured out how to
+use the PPS support in Solaris 2.6 with ATOM - without source changes to
+xntp):
+
+refclock_jupiter.c: In function `jupiter_ttyinit':
+refclock_jupiter.c:1305: `pps_enable' undeclared (first use in this function)
+refclock_jupiter.c:1305: (Each undeclared identifier is reported only once
+refclock_jupiter.c:1305: for each function it appears in.)
+*** Error code 1
+
+Adding the missing declaration is trivial of course, but whether that
+makes the code "correct" is another question - it seems to me that the
+#ifdef's guarding the two ioctl's towards the end don't really represent
+the appropriate logic - certainly both TIOCSPPS and I_PUSH are #defined
+on Solaris 2.6, for example, while it seems unlikely that both ioctl's
+should be done. (Of course running configure with --disable-JUPITER is a
+possible workaround for the problem.)
+
+Another thing, which you may or may not consider a "bug" worth fixing in
+xntp3 (sorry, I haven't looked at version 4 yet): It isn't possible to
+use LDISC_PPS if you *only* have the PPS-via-DCD signal (i.e. no
+timestamp data coming via the same serial port to be consumed by another
+clock driver) - I recently had a need for this as I wanted to feed the
+PPS signal to two computers, while only one received the associated
+timestamp (feeding this to both would have been complex as xntpd polls
+the clock - Arbiter).
+
+Now, refclock_atom.c has code to deal with the situation that there is
+no other driver opening the serial port, and will open it itself after a
+short delay - but when doing so, unconditionally uses LDISC_CLKPPS for
+no apparent (to me:-) reason. The very small change below will (obviously)
+make it use LDISC_PPS instead if PPS is #defined.
+
+I'm pretty sure this change is "safe", as PPS being #defined implies
+usage of LDISC_PPS in lots of other places in the code - e.g. atom_pps()
+will keep polling the port using CIOGETEV, which is inappropriate when
+it was opened with LDISC_CLKPPS. Of course some of the comments will no
+longer agree with the code, but I'd be happy to fix that up too if you
+decide to include the change.
+
+--Per Hedeland
+per@erix.ericsson.se
+
+
+*** xntpd/refclock_atom.c.orig	Sat Apr 25 01:14:20 1998
+--- xntpd/refclock_atom.c	Wed Apr 29 14:41:20 1998
+***************
+*** 456,462 ****
+  			 */
+  			(void)sprintf(device, DEVICE, unit);
+  			if (!(fd = refclock_open(device, SPEED232,
+! 	 		    LDISC_CLKPPS))) {
+  				refclock_report(peer, CEVNT_FAULT);
+  				return;
+  			}
+--- 456,467 ----
+  			 */
+  			(void)sprintf(device, DEVICE, unit);
+  			if (!(fd = refclock_open(device, SPEED232,
+! #ifdef PPS
+! 	 		    LDISC_PPS
+! #else
+! 	 		    LDISC_CLKPPS
+! #endif
+! 			    ))) {
+  				refclock_report(peer, CEVNT_FAULT);
+  				return;
+  			}
+
diff -urN xntp3-5.93c/util/Makefile.in xntp3-5.93d/util/Makefile.in
--- xntp3-5.93c/util/Makefile.in	Mon Aug 10 18:57:51 1998
+++ xntp3-5.93d/util/Makefile.in	Tue Jun 23 22:20:13 1998
@@ -296,7 +296,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/util/tickadj.c xntp3-5.93d/util/tickadj.c
--- xntp3-5.93c/util/tickadj.c	Thu Mar 12 21:21:54 1998
+++ xntp3-5.93d/util/tickadj.c	Tue Jun 23 22:03:07 1998
@@ -456,7 +456,7 @@
 
   fd = openfile(file, O_WRONLY);
 
-  if (setnoprintf && (dosync_offset != 0))
+  if (setnoprintf && (noprintf_offset != 0))
     {
       if (!quiet)
 	{
diff -urN xntp3-5.93c/xntpd/Makefile.in xntp3-5.93d/xntpd/Makefile.in
--- xntp3-5.93c/xntpd/Makefile.in	Sat Apr 25 18:21:36 1998
+++ xntp3-5.93d/xntpd/Makefile.in	Tue Jun 23 22:19:55 1998
@@ -227,7 +227,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
diff -urN xntp3-5.93c/xntpdc/Makefile.in xntp3-5.93d/xntpdc/Makefile.in
--- xntp3-5.93c/xntpdc/Makefile.in	Sat Apr 25 18:22:02 1998
+++ xntp3-5.93d/xntpdc/Makefile.in	Tue Jun 23 22:20:01 1998
@@ -208,7 +208,7 @@
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	  gawk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
